Merge pull request #9310 from annando/contact-posts