Merge commit '1519a60bbf8d81ae741c1f365eaa155b9d83dd3a' into HEAD
fr injection on 20140128-005536
Merge commit '6c1699bac122d96e39c72ec4c319272972f2779e' into HEAD
Merge commit '67806376757a6d011499cfb051211217155fb490' into HEAD
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt