Rubocop: New version breaks everything!
Merge pull request #2998 from daviddavis/temp/20130919083839

Rubocop: New version breaks everything!