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

Trivial merge