Fix some issues with the compatibility XML docs.
Merge branch 'release' into develop