copy code from 0.11 branch, closes #9106
Authored by: dstoecker 2010-06-16
Parent: [r9873]
Child: [r9875]