en injection on 20130827-050012
vi injection on 20130827-050012
Merge commit 'a99d1a299db062dc479dc6435b0b53e50836a827' into HEAD