Merged from upstream.  Needs testing on the machines
Merge branch 'master' of github.com:Ben0mega/jail

Conflicts:
	filter_file.cpp