Merge pull request #1068 from annando/post