Fix AttributesIterator (yes it's ugly when something implements both Iterable and Iterator)
Merge remote-tracking branch 'origin/master'