Revision dacc9230719329a1014dafb152e7d03d6087c781

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

Merge branch '1.4'