Merge branch 'master' into 1.3.x

# Conflicts:
#	RELEASENOTES.md
#	package.json
#	plugin.xml