Revision ae849ccc1f10794bc76432350934f1eb818dc136

Committed on 07/05/2018 6:06 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13