Merge branch 'master' into kazuho/experiments/minify2