Merge Port editors/vim 7.4.192_1 r346444