Add locale stuff for jqGrid
Merge remote-tracking branch 'origin/master' into solution