Merge remote-tracking branch 'origin/unstable' into unstable

diff --combined src/debug.c
index 3d169b1478d4eabc2f98dc7a009ee4f30910e31c,be3db882bbd8a863b5e3be6fc0032a9401616e6e..2725aae6ca3f8b9d2d26abd357bcd37df0ec84bf
--- 1/src/debug.c
--- 2/src/debug.c
+++ b/src/debug.c
@@@ -37,6 -37,7 +37,7 @@@
  #include <execinfo.h>
  #include <ucontext.h>
  #include <fcntl.h>
+ #include "bio.h"
  #endif /* HAVE_BACKTRACE */
  
  /* ================================= Debugging ============================== */
@@@ -833,7 -834,7 +834,7 @@@ void watchdogScheduleSignal(int period
      setitimer(ITIMER_REAL, &it, NULL);
  }
  
 -/* Enable the software watchdong with the specified period in milliseconds. */
 +/* Enable the software watchdog with the specified period in milliseconds. */
  void enableWatchdog(int period) {
      int min_period;