vi injection on 20140716-004923
Merge commit 'a2b4c880462597414b0f73f68221c86fc80940e5' into HEAD