Merge pull request #4635 from xmcclure/5.3-bump