Revision 8ffd27260258ae4f4836c67f5191999d08633087

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

Merge branch '2.0' into 2.1