dreschel,
Thanks for catching this one!
The best way to include the fix upstream is making a pull request with the patched USBCore.cpp on the ide_1.5.x branch:
if you can include also the CDC/SERIAL_BUFFER_SIZE fix it would be great.
If you don't have the time to fill a pull request, just send me a patch and I'll take care of it.
C