[master] 0a360b4 Sync with recent changes

[Federico G. Schwindt]

commit 0a360b4cd3e40c69db883bcbeaa5055e73418b39
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sun Sep 24 18:05:20 2017 +0100

    Sync with recent changes

diff --git a/.gitignore b/.gitignore
index 1c55b88..ba1a4d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,7 +109,7 @@ cscope.*out
 /bin/varnishtest/tests/*.log
 /bin/varnishtest/tests/*.log-t
 /include/*.log
-/include/vrt.c
+/include/_vrt.c
 /include/_vrt_test
 /include/vrt_test
 /include/vbm_test