Merge origin/master

Conflicts:
	config.xml
Merge origin/master