merge from google code