STONEHENGE-92

[Ben Dewey]

Avantika,

I've committed and tested the STONEHENGE-92 patch.   Please test the commit and 
resolve the issue if everything works for you.

-Ben Dewey