Bump version to 2.1.1.
Merge pull request #5471 from PrideChung/master

Bump version to 2.1.1.