Merge branch 'easymotor-flight'