official release 2.1
Merge upstream updates to version 2.1