Merge branch 'riastradh-20190917-fixamd64uuojmp'
authorTaylor R Campbell <campbell@mumble.net>
Wed, 18 Sep 2019 14:40:06 +0000 (14:40 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Wed, 18 Sep 2019 14:40:06 +0000 (14:40 +0000)

Trivial merge