Revision 6acd7bed5449479f16d65210ef9e2f3f6f06ed3b

Committed on 23/08/2018 2:44 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.0' into 2.1