vi injection on 20140720-005938
Merge commit 'f62bf82c760aee6857191aa4c791f76fe7ee14a5' into HEAD