Merge branch 'master'
Merge revisions 9515-9978 from SourceForge main/trunk
Remove oodialog.
Merge branch 'origin/merge_svn_main'