Bundle 20130617

https://github.com/rails/rails/compare/a9a33c59f64084733baec62aed4852fde6a88156...ce13dc28e47d739545da5732a2b23903c9b7ed84
Merge pull request #21 from mrtaddy/bundle/20130617

Bundle 20130617