Changes required before merging into the canonical Google Code repo