Merge remote-tracking branch 'origin/master' into msvc

Conflicts:
	.gitignore
	lib/nearest.c
	lib/pam.h