Merge branch 'master' of github.com:simplesamlphp/simplesamlphp

# By ezero
# Via ezero
* 'master' of github.com:simplesamlphp/simplesamlphp:
  MINOR: When using HTTP protocol the $_SERVER['HTTPS'] is not set.