avoid using void* where it is not necessary, minor cleanup
Merge branch 'master' into pba

Conflicts:
	protoc-gen-c-iter