Exit _fillContainsPoint earlier if possible
Handle nested definition tags
Merge pull request #1700 from tobytailor/master

Misc