FIX: handle null values in JSON encoder
FIX: loc-ley vs. loc-key
Setting version to 6.20-6
Setting version to 6.20-7-SNAPSHOT