Revision 74912a5ac9be09e8781678fffe0e9c23424daf42

Committed on 21/02/2019 2:00 pm by Adam Wójs <adam.wojs@ez.no> [GitHub Diff]

Merge branch '2.4'