Merge branch 'master' into client-connection
Merge pull request #632 from kitskub/client-connection

Merge master into client-connection
Fix merge error

Signed-off-by: Jack Huey kitskub@gmail.com