Update WIP4299 to be in sync with its feature request.
Merge pull request #5 from rseanhall/wip4299

Update WIP4299 to be in sync with its feature request