Getting into sync with Google Code version