Merge branch 'master' of git://git.xcsoar.org/xcsoar/master/xcsoar
Merge branch 'v6.4.x' of git://git.xcsoar.org/xcsoar/master/xcsoar
Merge branch 'master' of https://github.com/Exadios/xcsoar-exp