Revision ec6427b680f4cc6d0ea8b0869697681df627ec00

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

Merge branch '1.11'