Merge branch 'bug_10196' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 13 May 2013 14:02:34 +0000 (10:02 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 13 May 2013 14:02:34 +0000 (10:02 -0400)

Trivial merge