merge fix from david for warning during xml build