Fix parsing of reST codeblock options with hyphens.
Merge remote-tracking branch 'carljm/options-with-hyphens'