cherry-pick: 0f0ee32d7045bc75ce9759805d04874499f1c958 Tested-by: George C. Huntington III <gchiii at mtiemail.com> please add this to the 2011.03-maintenance branch