Fix XML well-formedness error (extra quote)
Fix python2.7 build: Remove patch that was in wrong project
Merge branch 'pythonfix'