vi injection on 20140908-005027
ro injection on 20140908-005027
Merge commit '451026097f98718a500894b27a368d8726fa54bb' into HEAD