Merge branch 'bug_9984' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 22 Apr 2013 00:44:05 +0000 (20:44 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 22 Apr 2013 00:44:05 +0000 (20:44 -0400)

Trivial merge