Upgrade to final Rails 4.0.0 release
Merge branch 'master' into modelling-users

* master:
  Upgrade to final Rails 4.0.0 release