changelog
fix docs
Merge composer/master into change-items-to-controllers
fix docs
fix docs