Fixed issue with the `locale_select_options()` function.
Merge branch '3.1'