Revision f551da39a90a318a3636dc9cb569d3639da39fc1

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

Merge branch '1.4'