Merge branch 'bug_8264' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 10:21:40 +0000 (06:21 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 10:21:40 +0000 (06:21 -0400)

Trivial merge