Merge branch 'ovs-dev', remote branch 'origin' into bsd-port