Merge remote-tracking branch 'origin/0.10'

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

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

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

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