Merge branch 'bug_9684' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 27 Apr 2013 11:08:15 +0000 (07:08 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 27 Apr 2013 11:08:15 +0000 (07:08 -0400)

Trivial merge