Merge commit '83e721492eeeb4aa1cdadcd574aa7921160e8b46' into HEAD
sq injection on 20140619-002108
cs injection on 20140619-002108
el injection on 20140619-002108
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt