Revision 5e1fdc8d2ee2c18d4fed95092e2a9f01b0026fb9

Committed on 01/12/2018 5:13 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.3'