Fixing build.
Merge branch 'master' into travis_test