Add attrs required for wait (bug 1024451)
Merge pull request #491 from muffinresearch/add-more-attrs

Add attrs required for wait (bug 1024451)