Sync with 3.6.3 bugid: 474
Sync with 3.6.3
bugid: 474


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