Fix whitespace
Cleanup
Fix XSD URL. Closes #912.
Fix XSD URL.
Merge branch '3.7'