Revision aceb4b2fd0d18c2fbd32b5ec5e62dc1366dd760c

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

Merge remote-tracking branch 'upstream/6.13' into 7.3