Merge "Merge branch '1.4-rel' (ca39b98)"
authorMats Wichmann <mats@linux.com>
Thu, 28 Jun 2018 13:18:35 +0000 (13:18 +0000)
committerMats Wichmann <mats@linux.com>
Thu, 28 Jun 2018 13:18:35 +0000 (13:18 +0000)

Trivial merge