Missing comma
Merge branch 'master' into ember-cli