Merge commit and conflict resolution

Merged master into issue-372-up-to-datasets.
Some conflicts were resolved. Most of them were due to docstrings that
were documenting the __init__() function rather than the class itself.