1.1.2dev: merge [11837-11839] from 1.0-stable
Authored by: jomae 2013-07-07
Parent: [r11839]
Child: [r11841]