Test 25
Merge branch 'master' into HEAD

Conflicts:
	.travis.yml