Merge branch 'bug_10085' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 23 Apr 2013 12:34:02 +0000 (08:34 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 23 Apr 2013 12:34:02 +0000 (08:34 -0400)

Trivial merge