Revision ae62c9f4743c154462725e3f42de04e0f7e0b014

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

Merge branch '1.13' into 2.1