Revision 28afb783d112e3a8b068d51c61d148e56f0f76f5

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

Merge branch 'master' into studio_master