Renamed because component.js is deprecated
Merge remote-tracking branch 'origin/master'