Fixed legend wrapping as per #1641.
Merge pull request #1652 from pjackson28/v3.0

Fixed legend wrapping as per #1641
Resolved merge conflicts.