Merge remote-tracking branch 'origin/MNH-52X' into MNH-52X
authorPhilippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Thu, 2 Jun 2016 15:16:32 +0000 (17:16 +0200)
committerPhilippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Thu, 2 Jun 2016 15:16:32 +0000 (17:16 +0200)

Trivial merge