don't pull UUID's Zero.
Merge pull request #971 from jtwigg/develop

don't pull UUID's Zero.
Merge remote-tracking branch 'upstream/develop' into develop