Another pass at merging master into emberCli to fix the history.