Fixed building on Linux.
Merge remote-tracking branch 'upstream/unstable' into unstable