Release v0.18.3
Merge branch 'master' into develop

Conflicts:
	docs/changelog.rst