Merge pull request #5732 from annando/fix-picture-posts