Merge branch 'vhost_directory' into all_features