Merge pull request #3353 from mrunge/master