Merge change Ied3304a0 into eclair

* changes:
  Only apply permission to files with +x