Revision 31cdb938c01cad50402d21127c6890e1e742cc93

Committed on 16/04/2018 8:05 am by André R <ar@ez.no> [GitHub Diff]

Merge branch 'studio_2.1' into studio_master