Revision c37b3fd8c2d90526728e4a138f0bc863ba73f0ce

Committed on 28/04/2017 4:35 am by Bertrand Dunogier <bertrand.dunogier@ez.no> [GitHub Diff]

Merge branch '1.9'