Fixing problem with attachments.
Merge branch 'master' into devel