Revision 40f419c53d0b9d544e34ca19c7a8052c8297a32f

Committed on 09/08/2018 4:24 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.1' into 2.2