Don't update the attachment counter before a post is submitted
Merge remote-tracking branch 'origin/stable'