forgot site-push.pp-example in docs
Merge remote-tracking branch 'origin/makefile' into makefile