Merge branch 'versioning-travis-test' into versioning-new