remove stray debugging code from condition-related patches
Merge remote-tracking branch 'upstream/master'