Merge master into rails 4 2

The purpose of this merge is actually to get the frontend specs on rails-4-2 passing. I'm hoping those failures were due to the russian ruples.
Line is too long. [133/100]