Merged changes from googlecode.com