ember-cli@0.1.5
Merge remote-tracking branch 'origin/master' into i18n