Update things so that Luma builds again on recent nightly#26

ProfElements merged 2 commits intorust-wii:mainrust-wii/luma:mainfrom

linkmauve:update-nightlylinkmauve/luma:update-nightlyCopy head branch name to clipboard