Merge branch 'master' into 0.11

diff --cc gst/gstregistry.c
Simple merge

diff --cc gst/gststructure.c
index 7c402de,271ef87..ca16622
--- 1/gst/gststructure.c
--- 2/gst/gststructure.c
+++ b/gst/gststructure.c
@@@ -171,13 -163,14 +171,13 @@@ gst_structure_validate_name (const gcha
      return FALSE;
    }
  
 -  /* FIXME 0.11: don't allow spaces */
    /* FIXME: test name string more */
    s = &name[1];
 -  while (*s && (g_ascii_isalnum (*s) || strchr ("/-_.:+ ", *s) != NULL))
 +  while (*s && (g_ascii_isalnum (*s) || strchr ("/-_.:+", *s) != NULL))
      s++;
    if (G_UNLIKELY (*s != '\0')) {
-     GST_WARNING ("Invalid character '%c' at offset %lu in structure name: %s",
-         *s, ((gulong) s - (gulong) name), name);
+     GST_WARNING ("Invalid character '%c' at offset %" G_GUINTPTR_FORMAT " in"
+         " structure name: %s", *s, ((guintptr) s - (guintptr) name), name);
      return FALSE;
    }