Adding rpy2 commits so I can update without some conflicts against changes over the weekend