Merge branch 'bug_9575' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 14 May 2013 12:29:35 +0000 (08:29 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 14 May 2013 12:29:35 +0000 (08:29 -0400)

Trivial merge