Created attachment 6952 [details] coverity patch
Comment on attachment 6952 [details] coverity patch Looks right.
Re-assigning to Karolin for inclusion in 3.5.next. Jeremy.
Pushed to v3-5-test. Closing out bug report. Thanks!