Merge branch 'release/v0.10.5' into develop
Changelog fo 0.10.5
Merge branch 'develop'

Conflicts:
	CHANGELOG.md
Merge branch 'master' into gh-pages