Revision 65f8096c81a93a3eacdac2778e665b4449d77b10

Committed on 01/12/2018 5:12 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.2' into 2.3