Updating: working in PROJECT/SMALL/file-packing
Merge remote-tracking branch 'upstream/master'
there is a problem with linking - what is the best way to handle this?