4.2.x
Merge remote-tracking branch 'origin/master'