fr injection on 20140611-005200
es-ES injection on 20140611-005200
Merge commit 'babc35c6925102260e9e7eee66f192211db78807' into HEAD