gocd merge 2014-05-27

Merging the latest changes from gocd into our version.