Revision 384db73a53cfa25e092b2c1c44d48977243c64c5

Committed on 01/02/2019 1:00 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '7.4'