merge travis_short branch, works on travis