Manual merge of https://github.com/jfryman/puppet-nginx/pull/100
Merge branch 'master' of https://github.com/jfryman/puppet-nginx