Revise mapping name for tabline
Merge branch 'master' into mac