Revision 7b9455f5a21a6c9e3011366c38f20275e0dd0565

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

Merge branch '1.13' into 2.2