Revision bd61b7c1417d878699ee47370a7451dcd25ca3c3

Committed on 18/01/2019 9:12 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '1.5' into 1.11