Merge remote-tracking branch 'upstream/master'

Conflicts:
	libmate-desktop/mate-desktop-utils.c
	schemas/org.mate.interface.gschema.xml.in.in
configure.ac: show the introspection status in the summary

Closes https://github.com/mate-desktop/mate-desktop/pull/150
Merge branch 'master' of github.com:dnk/mate-desktop

Conflicts:
	libmate-desktop/mate-desktop-utils.c
Merge remote-tracking branch 'upstream/master'