Merge remote-tracking branch 'origin/master' into client-connection

And more cleanup