Merge pull request #5217 from mikeller/fix_kisscc_motor_order