More debugging.
Merge remote-tracking branch 'origin/release' into release

Conflicts:
	.travis.yml