Merged r8682 and r8800 from trunk for 1.3.1 release.
Authored by: jplang 2012-02-06
Parent: [r8800]
Child: [r8802]