Changing master branch version to master
Make a fix for outputting into xml.
Merge branch 'master' into feature/numa

Conflicts:
	configure.ac