Self generated changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Preferences.sublime-settings