Merge branch 'bug_9961' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 8 May 2013 13:44:29 +0000 (09:44 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 8 May 2013 13:44:29 +0000 (09:44 -0400)

Trivial merge