Allow using bundler 1.5.x