Merge change Ib18a32c1 into eclair

* changes:
  Minor label change (size -> resolution)