Merge remote-tracking branch 'upstream/next' into next
linking to protobuf directly
Merge remote-tracking branch 'upstream/next' into next
Minor update to CMakeLists.txt.
Merge pull request #63 from Fraser999/MAID-500

Minor update to CMakeLists.txt.
Merge pull request #61 from ustulation/MAID-485_protobuf_update

MAID-485: linking to protobuf directly
Merge remote-tracking branch 'upstream/next' into routing_v2

Conflicts:
	CMakeLists.txt