Fixed locale as it was not passed correctly to the tracking app
Merge remote-tracking branch 'origin/master'