Merge branch 'bug_8278' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 8 May 2013 13:50:02 +0000 (09:50 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 8 May 2013 13:50:02 +0000 (09:50 -0400)

Trivial merge