Merge pull request #895 from annando/tumblr-https