SPY-274 fixes HIVE-2332 in code copied into Shark
Merge pull request #42 from markhamstra/HIVE-2332

SPY-274 fixes HIVE-2332 in code copied into Shark