Revision adff9a715a9fcc6c46025fdb20a363fefd6d011a

Committed on 07/05/2018 6:22 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.13' into studio_1.13