Removed the smattering of debug printk statements that I added while debugging
Merge remote-tracking branch 'origin/master'