Merge pull request #1474 from odenbach/vport