Merge pull request #4590 from xmcclure/master