Revision ba13194877023d87e68b154aea78930958c0fa52

Committed on 03/12/2018 9:32 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7'