various
Merge remote-tracking branch 'origin'

* origin:
  packages added