First release
Merge remote-tracking branch 'upstream/master' into 4.2