More efficient handling of new and sparse maps by only zero-ing out when there is something there to zero out.
Merge remote-tracking branch 'origin/master'