Comment 40 for bug 925776

Tested this with master and it does look better.

Picked the master version to master and rel_2_6; as for rel_2_5, used the backport branch.

For note, the upgrade script stamps were: 0882 is the 2.6/master version and 0883 was the 2.5 one, though a placeholder for 0883 exists in master for continuity.