Revision d4c4c0ea07e43203943472527f32a00101423cf4

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

Merge branch '2.2' into 2.3