Release 6.5.12
Merge remote-tracking branch 'upstream/master'