Merge branch 'master' into froyo-release