Set label only if it wasn't disabled manually
Merge pull request #387 from fran6co/patch-1

Set label only if it wasn't disabled manually
Merge remote-tracking branch 'sonata-project/master'