Bundle 20130618

https://github.com/rails/rails/compare/ce13dc28e47d739545da5732a2b23903c9b7ed84...37e6201eeb6994f4b1917c017f13ae1b51a1292d
Merge pull request #22 from mrtaddy/bundle/20130618

Bundle 20130618