FF: image-based classes should use BaseVisual for contains() and overlaps()
Merge branch 'master' of github.com:psychopy/psychopy