Merge branch '4229-close-files' closes #4229
authorTom Clegg <tom@curoverse.com>
Fri, 17 Oct 2014 15:45:33 +0000 (11:45 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 17 Oct 2014 15:45:33 +0000 (11:45 -0400)

Trivial merge