Merge pull request #1152 from freewil/remove-strange-debug