Revision e0b94e2b8586ab5c2082183ffcfd8d66a64872fb

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

Merge branch '1.5'