composer update
Merge branch 'master' into 2.2

* master:
  composer update