Merge branch 'master' into feature/4.0.x-translation
en injection on 20140329-002202
fr injection on 20140329-002202
ar injection on 20140329-002202
ja injection on 20140329-002202
de injection on 20140329-002202
vi injection on 20140329-002202
sv-SE injection on 20140329-002202
it injection on 20140329-002202
pt-BR injection on 20140329-002202
es-ES injection on 20140329-002202
ru injection on 20140329-002202
tr injection on 20140329-002202
zh-CN injection on 20140329-002202
fi injection on 20140329-002202
lt injection on 20140329-002202
no injection on 20140329-002202
sq injection on 20140329-002202
zh-TW injection on 20140329-002202
fr injection on 20140330-002434