Merge branch 'upstream'
authorBdale Garbee <bdale@gag.com>
Fri, 24 Feb 2017 21:48:55 +0000 (14:48 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 24 Feb 2017 21:48:55 +0000 (14:48 -0700)

Trivial merge