Merge pull request #3299 from mrunge/master