Fix build
Merge branch 'master' into travis.linux