dmwm/T0 — pull request #4007 by samircury (2012-11-13 10:20:09+00:00)
Title: fixing #4002

Same things but now against updated trunk