1. cb42a1b upstream: integrate block changes by David 'Digit' Turner ยท 14 years ago