Revision 5ddc5184c300ee7346f1c498269a586656e0edab

Committed on 20/03/2017 3:14 am by André R <ar@ez.no> [GitHub Diff]

Merge branch 'platform:master' into studio:master