preg_replace with /e was depreciated
Merge branch 'master' into my-3.0