am 192d5db1: Merge change Ied3304a0 into eclair

Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-mr2

* commit '192d5db1fedef99404644256f80740bb3763b049':
  Only apply permission to files with +x