Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:yaneurabeya/freebsd-ports

Conflicts:
	security/vuxml/vuln.xml