Revision 031facbf68f173017ad8a355e308662ca6c45658

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

Merge branch '2.2'