Merge branch 'jnoring-master'
Don't throw away the first packet.

We're resetting the queue here, but we might as well enqueue the data we
just received.
Merge commit '6fe0ab8' into gene_testing_3
Merge commit 'fb9dec2' into gene_testing_3