Merge branch 'master' into dynamicObject-name

Conflicts:
	CHANGES.md
Fix typo.
Merge branch 'dynamicObject-name' into kml