Strict standards fix.
Merge branch 'master' into 0.3
Bugfix to Entity hydration.
Merge branch 'master' into 0.3