Merge pull request #2411 from rolfbjarne/parse-debug-optionsapi-doc