Merge remote-tracking branch 'upstream/master' into upstream
Merge branch 'upstream' into github

Conflicts:
	.travis.yml