Revision 2c8dec2d904f6efd43173a7349140eaa95bdd040

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

Merge branch 'studio_1.13' into studio-demo_1.13