merge in branch with lucy's changes
authorBenjamin Mako Hill <mako@atdot.cc>
Wed, 22 Jun 2016 00:55:07 +0000 (17:55 -0700)
committerBenjamin Mako Hill <mako@atdot.cc>
Wed, 22 Jun 2016 00:55:07 +0000 (17:55 -0700)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?