Merge branch 'release/v0.5.8+2013.10.07' into develop

* release/v0.5.8+2013.10.07:
  refs #3498: Keep package.json on release
  Refs #3064: update package.json dependencies to #master.