Merge branch 'master' into wordpress
add number to locale string conversion
improve errors behaviour
Merge branch 'wordpress'