Fix the build
Merge branch 'master' into gh-9