Update package metadata
Merge branch '2.1'