Add CHANGELOG entry for #1023
Improve the documentation of the i18n_scope option
Add a test case for the i18n_scope