Git snapshot: take a snapshot and stash it without messing with your working tree
Merge remote-tracking branch 'upstream/master'

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