GH-951 options.classes: Use 2 different parameters. 1 for interal usage and other for user usage.
Merge remote-tracking branch 'chico.guille/v1.0' into v1.0