Update master with graylog2-server's latest