Merge branch 'bug_9523' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 22 Apr 2013 01:06:56 +0000 (21:06 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 22 Apr 2013 01:06:56 +0000 (21:06 -0400)

Trivial merge