Added the latest changes from ember 1.1.1