Revision 42151ec074a04a528999341b0127ed3d7a8eb653

Committed on 11/04/2018 2:48 pm by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.13' into 2.0