This commit was manufactured by cvs2svn to create branch 'RC_1_33_0'.

[SVN r30300]
merged from trunk


[SVN r30560]
Merge fixes for unregisted options and inaccessible 'style_parser' method
from trunk to RC_1_33_0.


[SVN r31615]