Merge pull request #3187 from akoeplinger/mstestsuite-on-prs