Integrated commit 36a1409 from origin

My gemfile doesn't like to link to this specific commit, so I'm doing
it this way.