Revision 2ab8e2f63da5e75e2190ccceebb74c7507639a82

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

Merge branch 'studio_1.13' into studio_2.2