prepare version 6.0.16
Merge remote-tracking branch 'upstream/master' into 6.1.x