Fix bug 1082646 - Allow locale to be set to null