Merging In Fix For ItemizedIconOverlay

See #368 for more information.