into branch
re-commit from ubuntu
Merge branches 'master' and 'ppclient'

Conflicts:
	site.pp
Revert "re-commit from ubuntu"

This reverts commit a958c7256da6092b9b27c303535511ebcc2f2d79.

Conflicts:

	site.pp