Merge remote-tracking branch 'origin/ssh-6.6p1'