Rehash to get `bundle` command
Merge remote-tracking branch 'upstream/master'