Fixes for Cython 0.21
Merge branch 'master' of ssh://github.com/kivy/kivy

Conflicts:
	kivy/lib/gstplayer/_gstplayer.pyx