Merge "Avoid leaking cursors"
Jeff Sharkey [Sat, 10 May 2014 21:05:15 +0000 (21:05 +0000)]

Trivial merge