Merge proposals dependent on lp://staging/~davidc3/onehundredscopes/scummvm

lp://staging/~davidc3/onehundredscopes/scummvm has no merge proposals.