Merge pull request #476 from jeremygray/master

DEMO: shapeContains.py deliberately mixes units