Merge branch 'bug_9997' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 12:33:13 +0000 (08:33 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 12:33:13 +0000 (08:33 -0400)

Trivial merge