Unstashed changes

I stashed these to do a Sync, then did a "git stash pop" to get these
changes back.