Merge branch 'master' into release/v0.6.6+2014.01.27

* master:
  Refs #EAGLESIX-356. Updated package json for source to stash move.
  Refs #4845: update package.json dependencies to #master.