merged master into
Merge branch 'master' of github.com:elemhsb/paparazzi