[rc] remote merge
[rc] fix line numbering and vundle bundles
Merge remote-tracking branch 'bertha/master'