Revision ffab46deb5b157182d7ca97dc4807d821e2f5e3a

Committed on 24/01/2018 6:03 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13