Merge branch 'bug_9219' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 12:18:59 +0000 (08:18 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 12:18:59 +0000 (08:18 -0400)

Trivial merge