commit 5d099e94319152e8c38d157767ae06fc60cb3548 Merge: b4902bf dd31fc2 Author: Martin Blix Grydeland <martin at varnish-software.com> Date: Mon Nov 16 13:50:41 2015 +0100 Merge branch 'franciscovg-master'