Merged in filnet/librepilot/misc_fixes (pull request #484)