master: Updated to handle OPTIONS requests correctly.