Removed deprecated wcm_get_user_locale() from public API functions.
Fixed mergeconflict from 1.7.1 > 1.7.2