Merge commit 'fffbc920b325a2e4d32115b6b7a6e7f2d99fc278' into HEAD
Merge commit 'b8f3ddda783dd70628f1f0d4258c5a47b923cc4e' into HEAD
vi injection on 20140215-002056
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt