Merge branch 'bug_6506' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 12:44:16 +0000 (08:44 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 12:44:16 +0000 (08:44 -0400)

Trivial merge