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