r2326
Merge pull request #5374 from rednoah/master

r2326