Merge branch 'sg/travis-check-untracked'