buffer bar
Merge branch 'm' into buffer-bar