fix travis version numbers (unshallow git clones, see 402a94e46040cd6a35d)
Merge branch 'releases'
Merge branch 'master' into interpolating

Conflicts:
	.travis.yml