Sync with 3.6.3 bugid: 499
Sync with 3.6.3
bugid: 499


rockfordlhotka/csla,BrettJaner/csla,jonnybee/csla,MarimerLLC/csla,ronnymgm/csla-light,ronnymgm/csla-light,JasonBock/csla,BrettJaner/csla,jonnybee/csla,ronnymgm/csla-light,BrettJaner/csla,JasonBock/csla,jonnybee/csla,rockfordlhotka/csla,JasonBock/csla,MarimerLLC/csla,rockfordlhotka/csla,MarimerLLC/csla