• Cleanup and fix build errors after long rebase

    @ferjm
    ferjm committed Jan 16, 2019
    59141c8