Merge branch 'feature/4.1.x-translation' into feature/stabilization
sq injection on 20140516-095157
Merge remote-tracking branch 'remotes/origin/feature/4.1.x-translation' into feature/4.1.x-translation-jipt