Merge branch 'helptags'
Merge branch 'buffnumbers'