backport 3.2 spec fixes
Merge branch 'jquery' into rails3.2_ruby_1.9.3