Fix an error on https://www.tumblr.com/
Merge branch 'refs/heads/topic' into dev