Merge branch 'master' of https://github.com/aarongo/maintain

Conflicts:
	zabbix-server2.4/README.md
OVer