Revision 4ef2579870ea72219b7624b33d854900deef9554

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

Merge branch '1.13' into 2.2