vi injection on 20140706-005003
Merge commit '64b15930b81d8651f1115694dbafdaf2fc1428a6' into HEAD