1.1.1dev: finish merge from 1.0-stable, update svn:mergeinfo.
Authored by: cboos 2013-02-02
Parent: [r11653]
Child: [r11655]