Auto-Merge pull request #3286 from mrunge/master