Revision 67e21ea2aacb80d005c5ee2e01c631426ec4904f

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

Merge branch 'studio_master' into studio-demo_master