Merge branch 'adhoc/travis-build-test' into feature/unit-models