Revision 6861a07cb18b5320d54e9364ba9154e73273429f

Committed on 20/12/2019 2:35 am by Bertrand Dunogier <bertrand.dunogier@ez.no> [GitHub Diff]

Merge branch '2.0'