Remove bundle_cache so that Travis builds others' forks
Merge remote-tracking branch 'upstream/master'