Revision 38e83e192640fdbcb3b2d37b5b25543688ee1c6c

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

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