ar injection on 20130802-110919
vi injection on 20130802-110919
Merge commit '26daf5500014d6d2bb5ed681212c3a3f75f24390' into HEAD