Conflicts: gcov.diff server/core/buffer.c server/include/buffer.h server/modules/routing/readwritesplit/readwritesplit.c