Finishes entity package merging to 1.8 \o/