Merge commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a' * commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a': Optional use of UTF-8 strings in resource bundles
Merge commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a' * commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a': Optional use of UTF-8 strings in resource bundles