fixed php 5.5 warning: PHP Warning:  preg_replace_callback(): Modifier /e cannot be used with replacement callback
Merge remote-tracking branch 'bes89/master'