Revision b206cac32b720704cb34ab3b1224ed96cf8790e8

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

Merge branch 'studio_2.1' into studio_master