Merge branch 'master' into google_code