Merge "Merge branch '1.4-rel' (758fc4a)" nhs-test
authorMats Wichmann <mats@linux.com>
Tue, 25 Sep 2018 13:47:10 +0000 (13:47 +0000)
committerMats Wichmann <mats@linux.com>
Tue, 25 Sep 2018 13:47:10 +0000 (13:47 +0000)

Trivial merge