en injection on 20130827-050012
fr injection on 20130827-050012
Merge commit 'd48b4e3ad2f0c2f5e7da6e09a06c2aedfaa1cb2d' into HEAD