Merge branch 'upstream' into doc-orig doc-orig
authorBdale Garbee <bdale@gag.com>
Tue, 17 May 2016 20:12:58 +0000 (14:12 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 17 May 2016 20:12:58 +0000 (14:12 -0600)

Trivial merge