Merge upstream changes (without trailing newline)

Conflicts:
	lib/sweet-alert.min.js