merge upstream/master
authorSeth Chandler <sethbc@sethbc.org>
Sat, 19 Nov 2016 16:20:41 +0000 (11:20 -0500)
committerSeth Chandler <sethbc@sethbc.org>
Sat, 19 Nov 2016 16:20:41 +0000 (11:20 -0500)

Trivial merge