Merge branch 'master' of github.com:netmanagers/puppet-squid
Trying to fix travis builds