Merge pull request #2168 from annando/1512-contact-posts