Merge branch 'master' of https://github.com/pfsense/pfsense-packages

Conflicts:
	pkg_config.10.xml