0.13dev: Merged [10016:10018] from 0.12-stable.
Authored by: rblank 2010-08-27
Parent: [r10018]
Child: [r10020]