Fixed unsubscription issue in buffer with time and a potential
concurrency issue in merge.
Whitespace fix.
Merge pull request #1886 from akarnokd/MergeFix

Buffer with time and merge fix