Merge branch 'master'

Conflicts:
	.travis.yml