#2 Fix expiration in ExpirationMap

Merged
jonathan merged 2 commits from kris/fix_expiration_map into master 4 years ago