Merge

diff --cc ChangeLog
index 5750968b5dd8f7d88e57ee466c3e05ebe7430ad4,eae69e8b999ad0f61afe74c9dbb0953eea7c8d36..6ab3531682e41a03594334535538d1cf5b7841aa
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +  * New consistent distribution tests.
 +  * Found a memory leak when a server constantly fails.
+   * Fix in watchpoint macro
    * Changed default timeout to 1 second for poll timeouts
    * Wheel uses less memory/dynamic allocation for size (no longer limited to
      512 hosts by default.