Revision d2583391b981af169b29a39bf1398f9e8301c9c0

Committed on 11/04/2018 2:51 pm by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.13' into 2.0