USE. STANDARD. RAILS. MECHANISMS. Grrrrrr...
Merge branch 'master' into develop

* master:
  USE. STANDARD. RAILS. MECHANISMS. Grrrrrr...