Merge branch 'jnoring-master'
No need to check for an empty queue.  The == queue_.end() check will handle it.  Also add a debug message if we nuke samples.