Minor corrections
Fix race when subscribing to event stream
Merge branch 'master' into r-0.3
Set release version to 0.3.4
Merge branch 'master' into r-0.3