Merge branch 'master' into bug/fix.windows

Conflicts:
	SublimeQuickFileCreator.py