Merge branch 'bug_7054' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 11:47:56 +0000 (07:47 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 11:47:56 +0000 (07:47 -0400)

Trivial merge