Added X-Forwarded-Proto option when forwarding https to http
Merge branch 'master' of github.com:justin8/puppet
Merge branch 'master' of github.com:justin8/puppet