IDE Whitespace fail again.
Merge remote-tracking branch 'origin/lowjoel-fix-nonpersisted-touch' into rails4