Git snapshot: take a snapshot and stash it without messing with your working tree
Merge branch 'master' into jby_new

* master:
  Git snapshot: take a snapshot and stash it without messing with your working tree