Merge master into develop#2123

inclement merged 7 commits intokivy:developkivy/python-for-android:developfrom

inclement:develop-master-mergedinclement/python-for-android:develop-master-mergedCopy head branch name to clipboard