vi injection on 20130802-110919
Merge commit '7699d4bd5b22c167c63d14812d4c494152a411ff' into HEAD