Ability to disable protocol buffers server
Merge remote-tracking branch 'realorigin/master'