Remove invalid "set locale" sample
Merge branch 'master' into production