Merge branch 'bensmrs/stash'