...
Renaming
Merge remote-tracking branch 'origin/master' into pb4

Conflicts:
	src/Data/ProtocolBuffers.hs
Fixing build break