Merge tag '2.1.3' into develop

Tagging version 2.1.3 2.1.3
New version number
Merge branch 'release/2.1.3'