only clean non-convex shapes
Added Clean command to ImageFrame (since we had it on everything else anyways.)
Commented assert that doesn't actually prevent anything from happening (everything works fine still if you just say ignore anyways)
Merge remote-tracking branch 'upstream/master'