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