Workaround ember-cli bug (https://github.com/stefanpenner/ember-cli/issues/2038)
Merge branch 'master' into twitter