rewrite
- final entity fix revs #1 (for the 1000th time :P)
Merge remote-tracking branch 'origin/master'