Merge pull request #4689 from jmarshallnz/label_auto_width_fix