Fixed issue caused by improper locale resolution on the demonstration server.
Merge origin/master