Merge branch 'upstream' into doc-orig
authorBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 18:40:35 +0000 (20:40 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 18:40:35 +0000 (20:40 +0200)

Trivial merge