Quote ;transport=TCP correctly
Merge branch 'iss132' into dev
Update cpp-common to master