Update the Dataset#offset support

Merging in updates from master.