Merge change I55eb40e7 into eclair-mr2

* changes:
  Fix ExtendedProperties trigger.