pculture/miro — pull request #308 by bendk (2012-03-28 21:12:50+00:00)
Title: Fix18806

Bunch of fixes for #18806. I'd love review, but please don't merge until Janet says that its fast enough on her machine.