Merge commit 'f1d38aa9da7999a8c2b65aeedd7b8954a01eab41' into HEAD
lt injection on 20140307-002107
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt