Reverse commit 'dafaf8df45515f2621dbacefdd5d8d4c36133dce'
Merge branch 'master' into rails4