Merge pull request #486 from jcarlson/attributes

Better support for read-only attributes sent back by the server