Revision 307e869c7ffbd354814a3588773904a2c0343a9a

Committed on 24/09/2018 3:44 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13