Fixed make on x86 & x64 all.
Merge branch 'fixtest' into my_branches