Merge remote-tracking branch 'upstream/master'

Conflicts:
	addons.xml
	addons.xml.md5