Fixed crash when injecting too many locales
Merge remote-tracking branch 'origin/master' into tag_block_editor