Merge branch 'master' into ubuntu

Conflicts:
	.gitignore