Merge branch 'hotfix/722'

Close #722
Merge branch 'hotfix/723'

Close #723
Bumped to 2.1.4
Merge branch 'releases/2.1.4'

Prepare for 2.1.4 tagging
Merge branch 'releases/2.1.4' into develop

"merge" 2.1.4 version bump
Bump to next dev version

- Bump to 2.1.5dev
Merge branch 'version/bump' into develop

Conflicts:
	docs/languages/en/conf.py