Merge branch 'bug_9358' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 23 Apr 2013 13:04:19 +0000 (09:04 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 23 Apr 2013 13:04:19 +0000 (09:04 -0400)

Trivial merge