Another STABILITY fix, now ALL of our non-booting watches work!
Merge remote-tracking branch 'upstream/master'