Merge branch 'bug_8986' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:35:24 +0000 (13:35 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:35:24 +0000 (13:35 -0500)

Trivial merge