Merge "Merge branch '1.3-rel' (0615f17)"
authorMats Wichmann <mats@linux.com>
Fri, 20 Apr 2018 12:48:25 +0000 (12:48 +0000)
committerMats Wichmann <mats@linux.com>
Fri, 20 Apr 2018 12:48:25 +0000 (12:48 +0000)

Trivial merge