Author: Felix Paulusma <Vlix@users.noreply.github.com>
Committer: GitHub <noreply@github.com>
Merge branch 'master' into count-connections-when-accepted