Handle OPTIONS * requests
Merge pull request #6946 from stuartwdouglas/options-8.x

Handle OPTIONS * requests