Revision 746ed694940507dad05abf313fcd6506a66f561f

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

Merge branch '4.0'