Merge branch '5182-cors-error-reporting' closes #5182
authorTom Clegg <tom@curoverse.com>
Tue, 10 Mar 2015 20:06:37 +0000 (16:06 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 10 Mar 2015 20:06:37 +0000 (16:06 -0400)

Trivial merge