Fix startup error from 5c3fe268da2aa2c9194bf626ba3993b10dc77af9
Merge branch 'master' into gh-pages
Update build artifacts