Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	bindings/python/Makefile.am
	bindings/python/ges-types.defs
	bindings/python/ges.defs
	bindings/python/ges.override
	bindings/python/gesmodule.c
	bindings/python/testsuite/test_textoverlay.py

diff --cc configure.ac
Simple merge

diff --cc docs/libs/ges-sections.txt
Simple merge

diff --cc ges/Makefile.am
Simple merge

diff --cc ges/ges-timeline-pipeline.c
Simple merge

diff --cc ges/ges-timeline.c
Simple merge

diff --cc ges/ges-track.c
Simple merge

diff --cc ges/ges.c
Simple merge

diff --cc tests/check/ges/save_and_load.c
index 35b9552,c13f0ea..458313c
--- 1/tests/check/ges/save_and_load.c
--- 2/tests/check/ges/save_and_load.c
+++ b/tests/check/ges/save_and_load.c
@@@ -20,9 -20,9 +20,11 @@@
  #include <ges/ges.h>
  #include <gst/check/gstcheck.h>
  #include <string.h>
+ #include <unistd.h>
+ #define GetCurrentDir getcwd
  
 +#include <gst/audio/audio.h>
 +
  #define KEY_FILE_START {\
    if (cmp) g_key_file_free (cmp);\
    cmp = g_key_file_new ();\

diff --cc tests/examples/ges-ui.c
Simple merge

diff --cc tools/ges-launch.c
Simple merge