Revision c25890e21c19a00c55feafb3cac221f9dfc626a1

Committed on 11/02/2019 4:25 am by Adam Wójs <adam.wojs@ez.no> [GitHub Diff]

Merge remote-tracking branch 'upstream/7.4'