Add unit test.
Add CHANGES entry.
Merge pull request #1 from mdboom/vo/masked

Vo/masked