This finished what was partially fixed in be9ec7c6. Patch submitted by Jim Garrison <jim@garrison.cc>. Signed-Off-By: Bradley M. Kuhn <bkuhn@sfconservancy.org>
be9ec7c6