Merge branch 'efficient_attributes' into attribute_access