Merge remote-tracking branch 'origin/buildXMLbug'
Merge branch 'master' of https://github.com/pablorfb/SQM