Merge branch 'refs/heads/rake'