Merge branch 'stable-2.7'

* stable-2.7:
  Allow label values to be configured with no text
  Fix spelling mistake in the 2.7 release notes