Add warning about Settings.on_config_change() value type
Factor layout_text to simplify using inlined functions, fix space stripping with halign, add complete keyword to layout_text.
fix syntax highlighting issue where strings containing a colon would cause error
When strip is True, strip markup text before annotating, update markup to use the layout_text method, when not even single char fits on line, still display first char.
Make line_height a float instead of int.
Merge pull request #2033 from hallfox/master

Fix Syntax Highlighting for Sublime Text
Automatically focus SettingString textinput when popup opens
Merge pull request #2030 from bionoid/on_config_change

Add warning about Settings.on_config_change() value type
Merge pull request #2036 from bionoid/settingsfocus

Automatically focus SettingString textinput when popup opens
settings: remove focus merge from bionoid
audio: fix leak in SDL implementation (iOS)
texturecompress: use a POT size of PVRTC (same for width/height), otherwise the OSX texturecompress will fail.
Merge branch 'master' of ssh://github.com/kivy/kivy

 Please enter a commit message to explain why this merge is necessary,
window/gl: prevent iOS buffer to be prefetched by correctly cleaning all the sub buffers.
imageio: fix another leak
doc: corrected and elaborated for storage/__init__.py
doc: revisions to storage/__init__.py
doc: corrected typo
Add shorten options shorten_from and split_str, implement shorten in label and makrup_label, fix line centering for label rendering.
Add more markup tests to the test widget.