adapt pull request 424
Merge remote-tracking branch 'origin/4.2' into 4.2