Merge branch 'version/bump'
[2.1.3] bump version
Merge branch 'releases/2.1.3'

2.1.3 readiness
Merge branch 'releases/2.1.3' into develop

2.1.3 readiness

Conflicts:
	docs/languages/en/conf.py
Bump version to 2.1.4dev
Merge branch 'version/bump' into develop

Conflicts:
	docs/languages/en/conf.py