vi injection on 20141103-005130
Merge commit 'a6b6e529e4aa5f16c462e5f6b6a4d3f9d81f3412' into HEAD