Fixed problem with labels causing the legend to crash.
Fixed tiny typo.
qMerge remote-tracking branch 'upstream/master'