[MH,RG] FINAL-COMMIT
x
Merge branch 'master' of https://github.com/renegau/sw14_free_36