Merge branch '1.10'
authorAshley Yakeley <ashley@semantic.org>
Mon, 20 May 2019 23:32:03 +0000 (16:32 -0700)
committerAshley Yakeley <ashley@semantic.org>
Mon, 20 May 2019 23:32:03 +0000 (16:32 -0700)

Trivial merge