Sync boilerplate with Rails 4.1.6