Merge branch 'dev' (early part)

Conflicts:
	RELEASENOTES.md
	plugin.xml