fr injection on 20140916-005033
es-ES injection on 20140916-005033
Merge commit 'ad008a7414a2fe0d98ec1b34a8e14a8eea7d585c' into HEAD