Revision 9811ea6d5b5c1e6a8ca36ee3d74c387614778ec2

Committed on 10/04/2018 11:57 pm by André R <ar@ez.no> [GitHub Diff]

Merge branch 'studio_1.13' into studio_2.1