Merge proposals dependent on lp://qastaging/~random-stuff/mupen64plus/mupen64plus-video-z64-debian

1. mupen64plus-video-z64-debian
2. Dependent merge proposals