Merge remote-tracking branch 'dermoth/pu'

Conflicts:
	configure.in
	plugins/Makefile.am
	plugins/check_ssh.c
fix