Merge pull request #4602 from opdenkamp/pvrgotham