Merge branch 'rails4-upgrade'