Merge branch 'master' of https://git.eclipse.org/r/gendoc/org.eclipse.gendoc