Fix decode comments
Fix tests
Merge branch 'fix_comments_decode' of git://github.com/Ratio2/buildbot