Fix for bug 304: multiple vendor-options with same vendor-id are merged