Revision 9668cc2e945d3467ddb03b33fb8024caf14d185b

Committed on 21/01/2019 3:26 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.4'