adding OPTIONS support
sync CHANGES
bump trunk to 0.9.11