Update for Cogl API breaks

Conflicts:
	configure.ac
Merge branch 'master' for Release_2.1.5-rc2