Merge commit '54bab8e7276d7fad8e715a4414b8bb1f6e773a2f' into HEAD
fr injection on 20140621-002101
ar injection on 20140621-002101
ja injection on 20140621-002101
de injection on 20140621-002101
vi injection on 20140621-002101
sv-SE injection on 20140621-002101
it injection on 20140621-002101
pt-BR injection on 20140621-002101
es-ES injection on 20140621-002101
ru injection on 20140621-002101
tr injection on 20140621-002101
zh-CN injection on 20140621-002101
fi injection on 20140621-002101
lt injection on 20140621-002101
no injection on 20140621-002101
sq injection on 20140621-002101
zh-TW injection on 20140621-002101
cs injection on 20140621-002101
uk injection on 20140621-002101