xtrace test

Conflicts:

	.travis.yml