Add missing attachment setting.
Merge branch 'master' into ascraeus