Merged r9696 from trunk. Updates for 2.0.0 release.
Authored by: jplang 2012-05-14
Parent: [r9696]
Child: [r9698]
