Rails 3.2.17
Merge branch 'develop'