vi injection on 20140705-005121
Merge commit '739711b23df2965bc13ab955c22c5d13c27ec3f5' into HEAD