refs #43 - tweaks to make it compile on precise
Merge branch '2.x' into 3.x

Conflicts:
	gcs/src/gcs.cpp
	gcs/src/gcs_dummy.cpp