Merge branch 'rails41'