Revision 8f38efc5a03cf4a98df97666465b948a98b90b1c

Committed on 07/03/2017 4:34 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.0' into 1.1