Revision 439893a70512642204cc199ddd8bcfc160a78230

Committed on 04/01/2018 4:00 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.2'