Merge commit '9c8199f59a47f629e1415f6a73afe271609c2154' into HEAD
fr injection on 20140617-002119
ar injection on 20140617-002119
ja injection on 20140617-002119
de injection on 20140617-002119
vi injection on 20140617-002119
sv-SE injection on 20140617-002119
it injection on 20140617-002119
pt-BR injection on 20140617-002119
es-ES injection on 20140617-002119
ru injection on 20140617-002119
tr injection on 20140617-002119
zh-CN injection on 20140617-002119
fi injection on 20140617-002119
lt injection on 20140617-002119
no injection on 20140617-002119
sq injection on 20140617-002119
zh-TW injection on 20140617-002119
cs injection on 20140617-002119
uk injection on 20140617-002119