Revision cc54c0455b244750a9f8339220e4f0359b311264

Committed on 15/01/2019 9:48 pm by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.3' into 2.4