Resolving issue #398 regarding wrong fallback-logic for locale when using QueryBuilder.
Merge pull request #400 from abinici/master

Resolving issue #398