Merge commit '59b4c78d7e24b20c8ebb2653535b3eebd41f0f68' into HEAD
no injection on 20140603-002051
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt