Merge pull request #1190 from esdrubal/encoder-convert