Revision c4e07df8556637ab6db9c5bd98aeca1302e4c2ba

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

Merge remote-tracking branch 'origin/2.3' into 2.3