Rebase open PRs onto develop with Rails 4

If you have a pull request currently open against Foreman that's waiting
for review or re-review, please rebase it onto develop to pick up the
Rails 4 merge (earlier today). If it's waiting on contributor, please
only do it on your next update to fix comments.

Maintainers, please check before merging that either the PR's parent is
fb9f45e or newer, or that tests have run since (branches under test are
merged with develop before being run).

··· -- Dominic Cleal