Annotate stable map options
Merge pull request #2606 from tschaub/stable-map-options

Annotate stable map options.