Prepare 1.6.9 release
add locale length option for i18n behavior
Merge pull request #646 from csanquer/i18n_locale_length

add locale length option for i18n behavior
Fixed #651. Stupid typo.
Merge pull request #667 from jaugustin/backport-pr-666

backport Fixed #651. Stupid typo.