Merged upstream

I merged in the latest upstream code and made a slight modification (changed to relative) to the swc path in the fla file.