Merge branch 'develop'
Release v2.1.3
Merge branch 'master' into develop