Merge pull request #6537 from ngld/rtvnhnl