Updated from ember master.