Revision 095760ee845282c0d9d60808aec2de0df877a95e

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

Merge branch '2.3' into 2.4