Merge gocd 2014 05 27

Merging latest changes from official gocd git.