Allowing the property name "attributes" to be configurable.
Merge remote-tracking branch 'upstream/master'