I don't remember what I changed.
Merged changes from origin/master
Merge commit 'f9121f2'

Conflicts:
	Package Control.sublime-settings