Merge

52funnyrequested to merge
github/fork/jesseduffield/master into master

Created by: 52funny

合并请求报告