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

Trivial merge