Merge branch 'bug_10185' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 8 May 2013 14:00:53 +0000 (10:00 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 8 May 2013 14:00:53 +0000 (10:00 -0400)

Trivial merge