Merged in ronny's fixes for round filter

--HG--
branch : trunk