Merge pull request #603 from cgriego/patch-1

Don't inadvertently define BasicObject
changelog for #603