Merge proposals dependent on lp://qastaging/~jhasse/gtkmencoder/main

lp://qastaging/~jhasse/gtkmencoder/main has no merge proposals.