Merge pull request #1811 from jimsmc/master

p9dsu-xml points to latest commit.