Don't mess with bundler if it's not available
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Don't mess with bundler if it's not available