Upgrade xunit dependencies.
Merge branch 'master'
Merge 'master' and fix build breaks.