Fix postgis installation on travis CI
Merge branch 'branch-6-4'

Conflicts:
	.travis.yml