Merge with upstream.
Fix bug in _start_instance.
Merge remote-tracking branch 'upstream/master'
Merge InitHello/buildbot:master (PR #1046)