Merge pull request #34 from noslowerdna/CRUNCH-698

CRUNCH-698: Inclusion of local patch for AVRO-2944