test travis for 0.4.4
test
test2
Merge branch upstream

Conflicts:
	.travis.yml
Fix travis.yml
Merge branch 'master' into develop