Revision 92f6afda17b1b74cd8dcd80f1ac565957bb23ea8

Committed on 14/02/2019 6:34 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.4'