Merge pull request #6204 from mikeller/fix_rearming_without_gps_fix