Merge branch 'bug_10097' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 11:34:22 +0000 (07:34 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 11:34:22 +0000 (07:34 -0400)

Trivial merge