Zabbix

 - [ZBX-3628] fixed server crash while processing notification messages with an already deleted trigger
   [merge from branches/1.8 -c18607]
    Resolved conflicts in files:
        include/db.h
        src/zabbix_server/events.c
        src/libs/zbxserver/expression.c