Revision a5ecabfe889b5764a4b94ec3c43f2acebd4cc992

Committed on 20/09/2017 7:23 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.11