Revision 83cf6d92931cde30ff3ed7358272c562ef96d4d8

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

Merge branch '4.0'