Merge branch 'master' of https://github.com/kivy/kivy
Merge remote-tracking branch 'upstream/master'
syncing debian packaging files with those currently used for stable PPA and daily PPA
Merge pull request #2467 from thopiekar/master

Syncing debian packaging files with those currently used for stable PPA and daily PPA