Merge branch 'master' into patch-1

Conflicts:
	src/Fitztrev/LaravelHtmlMinify/LaravelHtmlMinifyServiceProvider.php