Add workaround for rails/rails#1755
Merge remote-tracking branch 'origin/master'