Merge branch 'nine' of git://github.com/delanne/buildbot into nine

+autopep8