Revision f3779755cf58040e8f2f23fa850edb1ea9efc241

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

Merge branch '1.13' into 2.0