Revision 697da56a4ed5a0b35331080b98947a70cd9b82ce

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

Merge branch '1.7'