Merge commit '978fc391360fc606d70db58f206e2f4a959c9c3f' into HEAD
cs injection on 20140524-002038
Merge remote-tracking branch 'remotes/origin/feature/3.5.x-PLF-translation' into feature/3.5.x-PLF-translation-jipt