Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/xrandr/msd-xrandr-manager.c
Merge branch 'master' of github.com:dnk/mate-settings-daemon