Update to 2.1.3.
Merge pull request #6353 from PrideChung/master

Update to 2.1.3.