removed bogus __getinitargs__()
Merge branch 'cliff'