Upgrade Entity API to 1.2. @0h20
Merge pull request #771 from tsteiner/entity-1.2

Upgrade Entity API to 1.2.