Fix an issue with auto rocket docking, should fix #806.
Merge remote-tracking branch 'origin/master'