Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml