Merge pull request #835 from nadment/HOP-2915