Merge branch 'hotfix/2.1.3'
Update docs.
Merge branch 'hotfix/2.1.4' into develop