Add attachment to articles modules
Merge origin/master