0.13dev: Merge [11016] from 0.12-stable
Authored by: jomae 2012-03-27
Parent: [r11016]
Child: [r11018]