Merge remote-tracking branch 'upstream/2.12.x' into 1.x

* upstream/2.12.x:
  Removed leftover couscous markup from the docs
  Updated Composer usage instructions
  Remove mentions of removed 'master' branch

Author: nicolas-grekas