Merge branch 'master' into openssh_work

Conflicts:
	.gitignore