* Rails 4.0.2
* Rails 3.2.16
Merge branch 'hotfix/2.5.1'

* hotfix/2.5.1:
  * Rails 4.0.2 * Rails 3.2.16