Revision 98c1154933ba3c66229035bce47be238f194009d

Committed on 04/10/2019 1:58 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.8