Preparing for 1.6.10
Merge remote-tracking branch 'origin/stable'