vi injection on 20140721-004921
Merge commit '598f78c5af3e7b7cb80a4a53afd86fe5d03aeb62' into HEAD