Revision eb32fa9a6f034968aea1b9660c956f6dd742b68b

Committed on 11/10/2018 3:45 am by Dawid ParafiƄski <dawid.parafinski@ez.no> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.2'