Merge pull request #3387 from xmcclure/test-suite-bump