Revision 13d59a9944100e915b999f86204a3b1c193dc2e8

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

Merge branch 'studio_2.1' into studio_master