Revision 4441b63dd51be7660f55ac50bef955bd9d5201ba

Committed on 14/12/2018 12:03 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.2' into 2.3