Merge commit '7faa287b55004f41401accad6a4264dc4a139967' into HEAD
Merge commit '1c3e39fc2301d417cf0dbecc9686ccdcc76065c9' into HEAD
fr injection on 20140614-002134
vi injection on 20140614-002134
el injection on 20140614-002134
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt