Revision 9d20f5239a2f65be8986987ae2136d6403cd5bd8

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

Merge branch 'ezstudio:master' into ezstudio-demo:master