Revision d37fb468b8248acc0bac0bad934a90018c12b22b

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

Merge branch 'studio_2.2' into studio_2.3