Update documentation
Force setlocale to fix issue with some tests
Merge branch 'sonata/master'