Fixed typo causing entities not assigned properly on Entity events
Merge remote-tracking branch 'origin/master'