Merge branch 'bug_8840' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 13 May 2013 01:15:23 +0000 (21:15 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 13 May 2013 01:15:23 +0000 (21:15 -0400)

Trivial merge