Revision f100abe9895b1cbed3b20fcd834ec4a18dac71a8

Committed on 01/02/2019 7:43 am by Damian Zabawa <damian.zabawa@ez.no> [GitHub Diff]

Merge branch '2.4'