Fix check for undef according to new instance vars
Add php-fpm vhost option
merge