	Merge remote-tracking branch 'origin/master' into iss108
	Merge remote-tracking branch 'origin/master' into iss108

j-o/globjects,hpi-r2d2/globjects,hpi-r2d2/globjects,cginternals/globjects,j-o/globjects,j-o/globjects,cginternals/globjects,j-o/globjects