Revision 908a83c60ebddf0ce622babdd200bea444d10ea3

Committed on 16/04/2018 8:04 am by André R <ar@ez.no> [GitHub Diff]

Merge branch 'studio_1.13' into studio_2.1