vi injection on 20140720-005938
Merge commit '7e9b39a0ad513f7ed0d25b8c49d19de064aa0479' into HEAD