Merge 'stash-reflog' into HEAD