Merge pull request #2834 from hansmi/unbound159