Update Outdated Google Code References

Identical to PR #1592, but with the commits squashed into one.