Merge remote-tracking branch 'multiwii/master'