Cosmetic adjustments.
Merge branch 'master' into ebsco