Merge commit 'c2f7d6d1de630cb19898ec779509075b46ed5e6f' into HEAD
sq injection on 20140308-002041
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt