Code

Merge the attributes fix in from maint-1.6.7 branch