Merge branch 'bug_9824' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 17 May 2013 11:59:14 +0000 (07:59 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 17 May 2013 11:59:14 +0000 (07:59 -0400)

Trivial merge