Merges Through Jun30

I tried to do a couple of merges for USB. I merged all the commits through Jun30. I'm building it now.