Merge branch 'net-bridge-multiple-spanning-trees'