Merge branch 'hotfix/travis-conf2'
cache bundler
Merge branch 'hotfix/travis-cache-bundle' into develop