-change from private to protected access to promote easier subclassing
Merge branch 'master' of https://github.com/resiprocate/resiprocate