Revision 851829d604d4e5d0937e3f95e1c789ccf5609814

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

Merge branch '1.5'