Merge commit '51cd15ee6a91efc895bfabc182d18bf4d83a8df9' into HEAD
cs injection on 20140619-002108
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt