1.0.2dev: merge [11814-11815] from 0.12-stable
Authored by: jomae 2013-06-10
Parent: [r11815]
Child: [r11817]