Merge upstream 2.1.1

This merges all upstream changes from the 2.1.1 tag.

/cc @charliesome @tmm1