fix number format locale loading bug and quick shop totals
Merge remote-tracking branch 'upstream/master' into number-format