Okay, okay...bundler, whatevs
Merge branch 'rescue_from'