Not craching on bad items in diversity.json.
Merge remote-tracking branch 'upstream/master' into devFreeServer-registry-api