Merge branch 'master' into the-connection-object-glue
Merge branch 'the-connection-object-glue' of github.com:ashfall/tls into the-connection-object-glue