Bunch of safeguards for utf8 errors in buildout module
Merge branch 'buildout' into develop