Changed encoder interface.
Merge remote-tracking branch 'origin/master' into http_module