Fixes entity data injection crash for empty memcache data.
Merge remote-tracking branch 'origin/master'