Fix composer.json syntax
Merge branch '1.0.x'

* 1.0.x:
  Fix composer.json syntax