review commit
Merge branch 'improved_build_fix' into improved_build_travis_ci