Merge git://mikachu.ath.cx/vhostgen