Revision 18dbab309b573646a600e54dca1ba6398e572220

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

Merge branch 'platform:1.7' into studio:1.7