Rails 4.1.8
Merge branch 'master' into concept-details-redesign