Changes label from display:none to clip
Merge branch 'master' into v20131025