Add CORS GET support
Merge in master/origin; no conflicts.