pculture/miro — pull request #160 by bendk (2012-01-27 18:09:05+00:00)
Title: Fix17804master

Fixes for cherry-picked from the 4.0 branch.