Sync 1105 fix from force2b to SalesforceFoundation