vi injection on 20140908-005027
Merge commit 'c064d2429c011a17d4cb81c20ba7d150e1c778c3' into HEAD