fix-setattr-and-getattr
Merge pull request #976 from edx/ned/fix-setattr-and-getattr

fix-setattr-and-getattr