Fix E228
Merge branch 'e228' of git://github.com/ewongbb/buildbot