Change visibility of method from private to protected
Merge remote-tracking branch 'upstream/master'