Formatting
Merge branch 'tent-234-fix-extra-https-check' of github.com:talis/simplesamlphp into tent-234-fix-extra-https-check

Conflicts:
	lib/SimpleSAML/Utilities.php