Revision 2481adfbd7f5570e43c824cb1ea3eb12712bd660

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

Merge branch '1.7' into 1.8