Merge branch 'master' into memdisk-iso