Don't inadvertently define BasicObject
Merge pull request #739 from cgriego/master

Don't inadvertently define BasicObject