Fix parent::class inside traits
Merge remote-tracking branch 'core-parser/master'