Re-imported datasets

This re-import contains the changes from:
- https://github.com/quintel/etdataset/pull/532
- https://github.com/quintel/etdataset/pull/533