0.13dev: Merged from [10655/branches/0.12-stable].
Authored by: jomae 2011-03-24
Parent: [r10655]
Child: [r10657]