Merge change I5de51a43 into eclair-mr2

* changes:
  Allow photo changes to be uploaded to Exchange (fixes #2179082)