Blosc as subtree for merge

This PR contains only the two commits that should be merged from the ``blosc_as_subtree`` branch.