fixed a compilation error - defined GLib_UNIX
Merge remote branch 'upstream/master'