Rails 4
Merge branch 'rails4' into opensource

* rails4:
  Rails 4