Revision eb16f0e85b76f96293131af8580e02ad8c594146

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

Merge branch '1.13' into 2.2