Revision ddd2d7c658e084a00dbb02db28527d0e16370633

Committed on 29/11/2018 6:40 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.3'