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