Merge branch 'bug_9925' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 01:33:37 +0000 (21:33 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 01:33:37 +0000 (21:33 -0400)

Trivial merge