sync with edits on google code