Merge branch 'master' of https://github.com/kivy/kivy into Windows_friendly
Merge branch 'Windows_friendly' of https://github.com/vernondcole/kivy into vernondcole-Windows_friendly