When storing an undo state, don't discard the stored state
Merge branch 'master' of github.com:DavidKinder/Git