add uniquify buffer name style
Merge branch 'master' into windows