Changes from 3.0.19

Fix for panic found with some third party software in receive function.  Fix is already upstream.