test
Merge branch 'test' into dev

Conflicts:
	applets/clock/clock-location-tile.c
	mate-panel/panel-background.c
	mate-panel/panel-properties-dialog.c
	mate-panel/panel-run-dialog.c