Incorporate initial quickfix from zabbix/issues/130