Merge pull request #7700 from mikeller/fix_brushless_detection