Merge remote-tracking branch 'upstream/master'

Conflicts:
	capplets/appearance/appearance-themes.c
	capplets/common/mate-theme-apply.c
Merge branch 'master' of github.com:dnk/mate-control-center

Conflicts:
	capplets/appearance/appearance-themes.c
	capplets/common/mate-theme-apply.c