Revision 74ad59b8e8c4d7b03dc1bf09d746ab9cc74ca6c4

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

Merge branch 'studio-demo_2.1' into studio-demo_master