3b15a86
and fix the bad rebase This would have been easy without stomping on each others' feet. Thanks, "proven" packager.