fr injection on 20140713-005046
vi injection on 20140713-005046
Merge commit '7b13e623078d9f70e991dd64bbb52547c274e3b6' into HEAD