actually silence git stash
Merge branch 'master' into chrome-app

* master:
  actually silence git stash