Merge branch 'jc/doc-long-options'