mirror commit:wq
Merge branch 'master' of https://github.com/xiuyansyu/tumblr_edit