Make DEFAULT_PROTOCOL public

Fixes gh-2110
Merge branch '1.1.x'