Review for SAMZA-80

[Chris Riccomini]

Hey Guys,

I'm looking for a code review on SAMZA-80:

  https://issues.apache.org/jira/browse/SAMZA-80

This is a subtle, annoying, and somewhat unbelievable bug.

Cheers,
Chris