Make rubycop happy again
Merge branch 'develop' into rails-402