Merge branch 'sg/travis-fixes'