Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/monkeypants/MAVProxy
Merge branch 'master' into urllib2-wip