vi injection on 20140720-005938
Merge commit '05398f8b122fe5afc4c9867bbd53af333a971d2c' into HEAD