bundler/bundler — pull request #3290 by Who828 (2014-12-08 07:21:23+00:00)
Title: Merge of 1-7-stable with master

Merging remaining commits with master from 1-7-stable.