Revision 485760d89529c3c5e65d02121310e60acb79c8ba

Committed on 18/10/2018 12:14 am by Kamil Madejski <kamil.madejski@ez.no> [GitHub Diff]

Merge branch '2.3'