Merge from 4.2-dev
Merging from 4.2-dev