Merge master into Rails 4.2 branch and fix 1 broken test as a result.