Revision f82d43fd685802b00751118bf06282116220d58a

Committed on 28/12/2018 11:25 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.3'