Merge pull request #3961 from EricLuehrsen/unbound_20170206