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