replace deprecated preg_replace(//e) with preg_replace_callback
Merge remote-tracking branch 'upstream/master'