Merge pull request #1 from emberjs/master

Resync