re-push ddb088c and a14eb58 (gun-range), which author clobbered in 814408e (catajson-itemfactory)