Do not try to authorize OPTIONS requests
Upped version
Merge branch 'hapi8'