Fix pulldown position
Fixes Samba symlink vulnerability
Merge remote-tracking branch 'upstream/master'