Revision caf1d2b4d9c9584d686fc8b3791a02af4080c666

Committed on 13/10/2017 9:08 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.11