Merge branch 'fix-gsubprocess-tests' into 'master'

Revert "tests: Fix GOptionContext leak in GSubprocess tests"

See merge request GNOME/glib!551

gio/tests/gsubprocess-testprog.c

@@ -209,14 +209,11 @@ main (int argc, char **argv)
 
   if (!ret)
     {
-      g_option_context_free (context);
       g_printerr ("%s: %s\n", argv[0], error->message);
       g_error_free (error);
       return 1;
     }
 
-  g_option_context_free (context);
-
   if (argc < 2)
     {
       g_printerr ("MODE argument required\n");