Merge branch 'bug_8816' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 00:40:17 +0000 (20:40 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 00:40:17 +0000 (20:40 -0400)

Trivial merge