much better linker
Merge branch 'master' into gamesys