Merge branch 'bug_9839' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 21 Apr 2013 13:57:10 +0000 (09:57 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 21 Apr 2013 13:57:10 +0000 (09:57 -0400)

Trivial merge