improved delivery of east blocks
Merge remote-tracking branch 'upstream/master'
Merge upstream changes for Monday night hacking