Revision 3e959d89f03c2d60acc23651db16f1021437e0c3

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

Merge branch 'master' into studio_master