Attempt to workaround https://github.com/travis-ci/travis-cookbooks/issues/155
Merge branch '1.5' into 1.6