Revision f346d2b693574d5d71b09658b49797d41fae309a

Committed on 31/01/2019 7:31 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.2' into 2.3