Fix for MacOS X: ld does not supprt option -z;
Merge branch 'fix_3.3'