Integrate fixes for FM-255, FM-500, FM-531, and FM-532.
Authored by: briggs@adobe.com 2010-03-11
Parent: [r1308]
Child: [r1310]