Merge pull request #783 from mfournier/varnish4