Improved link x32/64 libs
Merge branch 'master' into steam-stable