fixed warnings and failure of fortunes test per issue #782
Merge remote-tracking branch 'upstream/master'
fix for issue #786 plus minor improvement to Dispatcher
Merge pull request #786 from jasonhinkle/master

Phreeze fix for query test warnings and fortunes test fail