fix for PHP 5.3   and closure using $this
Merge remote-tracking branch 'origin/master'