Revision 633f3791eb7b26532151eb8f2bee24da04dbc7f7

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

Merge branch '2.2' into 2.3