Merge original mininet/master into FlowForwarding fork

Motivated by FlowForwarding/mininet#4.