Fixed options handing according to the standard's reference
Authored by: artyom-beilis 2011-09-11
Parent: [r1966]
Child: [r1968]