Update version 2.1.3
Merge branch '2.1'