Fixed converging path, sort of
Merge remote-tracking branch 'upstream/master'