gpull/gpush: Improve handling for unstash conflicts.
Merge branch 'master' into fwmaster