Revision f5fa172eba6d71aede2c0ba1f1c18fc8488dbf00

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

Merge branch '7.4'