Remove annoying debug warnings.
Merge remote-tracking branch 'upstream/master'