Merge Attribute options changes with the current `master`

This resolves the merge conflicts of your attribute options changes when trying to merge them with the current `master` branch.

Simply merge in this Pull Request, and https://github.com/yui/yui3/pull/353 will be automatically updated.