Merge master to connection-replay-stefan #21

Closed kokoff closed 9 years ago